enabling resending token via email
fixing markup and removing shield
resend token via email
Merge branch 'devel' of github.com:18F/myusa-server into feature/after-email-signin
Merge branch 'devel' of github.com:18F/myusa-server into feature/after-email-signin

Conflicts:
	app/controllers/profiles_controller.rb
changing flash message
changing flash message test
changing new api key flash message
fixing typo
fixing typo in test
Merge pull request #295 from 18F/feature/after-email-signin

Feature/after email signin