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
Issue 118 - Functionality complete - Design nearly complete
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
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
Button is back to be <a> not <button>
Fix tests to match new CSS syntax for login
Merge branch 'devel' into feature/connect

Fixes merge conflicts but fails tests... TBD

Conflicts:
	app/controllers/sessions_controller.rb
	spec/features/devise/sessions/sign_in_spec.rb
Add back "Remember Me"

Tests pass, and remember me is now in the form to sign in.
Add HTML structure for a welcome message

When using OAuth, you want a welcome message to explain to the user
why they're here.  This implements the welcome message, contingent
on passing a @client variable that contains information about
the client application.
Show the user a top flash about why they're here

pass client app id through warden

Pass client_id through warden.authenticate! and then put in url querystring so that SessionsController can see it.

Update rspec tests

Update formatting for alerts
Fix typo; remove commented code

Minor typo in the header.

Commented code was a reference during development, but is
no longer needed.
Merge pull request #213 from 18F/feature/connect

Implement login screen designs
Merge branch 'devel' into feature/manage-approved-apps

Conflicts:
	spec/features/doorkeeper/oauth_spec.rb
Split Authorizations tests into a separate file
Merge branch 'feature/manage-approved-apps' into feature/revoke-app

Conflicts:
	spec/features/doorkeeper/oauth_spec.rb