Updates
Merge branch 'master' of github.com:joadr/Ubuntu-Boilerplate