Attempt fix for bundle exec errors
Straight up load
remove hipchat notices
Update gems
Merge branch 'master' into rails-4

Conflicts:
	Gemfile.lock
Updated gem conflicts