Update for dependencies
Merge branch 'master' of git://github.com/Cubition-Project/Bootstrap