Various changes for production
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit