contingency planning
Merge remote-tracking branch 'origin/master' into rabbithole

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #23 from balanced/rabbithole

contingency planning