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
v1 of contact view
changing header to h1
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