Merge pull request #66 from maxluzuriaga/master

Improved Oauth Callback screen
Content importing and OAuth basis
Merge branch 'master' of https://github.com/cangevine/STEAMnet
Merge pull request #67 from aphillips915/master

Import all Content Types and Basis of OAuth
Removed sensitive key/secret information from omniauth initializer, now they are set as environment variables on heroku.