Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login
Added twitter feature story
Have to do some dummy work here to make this statement look good, not terribly pleased
Merge branch 'development' of github.com:NYULibraries/login into feature/twitter
Twitter feature passes in selenium now but not poltergeist; also updated some core nyu login steps
Figured out how to mock omniauth-shibboleth login
Headless tests were running up against an SSL problem instead of using rack test
Merge pull request #5 from NYULibraries/feature/twitter

Feature/twitter
Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login

Conflicts:
	features/step_definitions/logging_in_steps.rb
Created cucumber environment; and rewrote some tests to work in that environment; also tagged some features for skipping in travis
Renamed urls helper for cucumber tests to something more relevant
Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login
Passing for nyuad
Merge branch 'development' of github.com:NYULibraries/login into feature/nyush_login

Conflicts:
	features/step_definitions/logging_in_steps.rb
Merge branch 'feature/nyuad_login' of github.com:NYULibraries/login into feature/nyush_login
Merge branch 'feature/nyuad_login' of github.com:NYULibraries/login into feature/nyush_login
NYUSH feature test passing