Adjusted .gitignore so bower.json is properly tracked for ember
merge omniauth_login with master