Stability updates
Merge branch 'master' of https://github.com/madebysource/generator-pho
Merge branch 'master' of https://github.com/madebysource/generator-pho
Merge + fix conflicts