Converted about to slim
Converted menu to slim
Fixed annotations
removed no longer necessary placeholder
Merge pull request #28 from eMergence-by-Design/convert-about-to-slim

PENDING CI: Converted about to slim
Merge pull request #30 from eMergence-by-Design/annotate-models

Annotate models
Merge pull request #29 from eMergence-by-Design/convert-menu-to-slim

Convert menu to slim
Run rubocop on the ci
added rubocop gem to gem file
Made clearer that those factories don't do anything
ignore vendor
Cleaned up style
Removed old open id gem stuff
Added Google oauth gem
fixed style in applicationhelper
Cleaned up js, and moved to coffee script
moved config to global scope
Merge branch 'master' into develop
Removed tokens from source
Merge branch 'develop' into move-js-to-coffee

Conflicts:
	app/assets/javascripts/application.js