bundle update
fixing octokit and active record
Merge branch 'master' of github.com:icco/code.natwelch.com

Conflicts:
	Gemfile.lock