merged stuff
added notice
Merge branch 'omniauth' of github.com:BlakeJenningsJohnson/stalkmore into omniauth
merge conflicts
Merge branch 'master' of github.com:BlakeJenningsJohnson/stalkmore