Merge branch 'hotfix/0.0.0.3' into develop
Merge branch 'hotfix/0.0.0.4' into develop
PuPHPet trials
removing vagrant stuff
fixing error
Merge branch 'develop' of github.com:derekaug/derekjaugustine.com into develop
Merge branch 'release/0.0.0.5'