Add changelog writing
Merge branch 'master' of github.com:tchapi/deploy-scripts

Conflicts:
	deploy.sh