Issue 118 - Added an email option partial for sign in
Issue #118 - User can connect via either google oauth or email

Design nearly complete - Need to consult with Ryan

Conflicts:
	app/assets/stylesheets/myusa.css.scss
Create/update chef roles to call correct recipes
Issue 118 - Functionality complete - Design nearly complete
Add ubuntu to sudoers

DB template fixes
Merge branch 'devel' into feature/database-separation
Fixed sudo
Merge branch 'devel' into feature/database-separation
ok Gemfile.lock, you win
Merge branch 'devel' into feature/connect

Conflicts:
	app/assets/stylesheets/partials/_myusa.css.scss

Resolved the stylesheet merge conflicts as best I can
Issue 118 - Fixed test
Switch to https git repo URL
No more devise.rb template
Remove dead symlinks
nginx & mysql setup fixes
Syntax error!
Add entries for email secrets
Added chef role for vagrant box
Implement design in #118

Clean up HTML/CSS classes.  Add responsive classes
and test in different browser sizes.

Hide both alert boxes by default and show them both
at the same time

Allow toggling back and forth between email and oauth login

Allow the _header_auth partial to take an optional
shield variable to show or not show the shield.

Focus the email field when that screen is shown
Merge branch 'feature/connect' of github.com:18F/myusa-server into feature/connect