Strap it up, Kris
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	script/bootstrap
Consistency
Merge pull request #8 from andycox/master

Set default RAILS_SECRET_KEY_BASE using SecureRandom.hex