As neo-Nazis head to Richmond, Trump boosts gun-rights rally