Various additions
Merge branch 'master' of https://github.com/andycrockett/homestead