Work in a non-Rails environment
Merge remote-tracking branch 'Hubbub/non_rails'