way better boot sequence
Merge branch 'master' of https://github.com/piesync/billbo

Conflicts:
	spec/spec_helper.rb