Updating from default wercker.yml
Merge branch 'master' of github.com:natebeck/manfred