Switched from using Magento's website to get the tarball to using the clone from github
Use bootstrap-sass-official as bootstrap package instead of unofficial version
Merge branch '0.3.0' of github.com:jshtylr/generator-magento into 0.3.0