Added better bootstrap
Merge branch 'master' of https://github.com/Semantiq/easyrider