Removed some crap
Merge branch 'master' into vagrant-boxes