Fix Makefile
Update release template
Merge branch 'master' of github.com:hawkthorne/hawkthorne-journey