needed permission to sudo bundle install --no-deployment
reset core files to versions from upstream for mavericks
Merge branch 'master' of https://github.com/jcowhigjr/our-boxen

Conflicts:
	Gemfile.lock