Working commit.
Merge branch 'master' of http://github.com/ahrekar/bacon-install

Necessary because current tip does not work.