update changelog
Add Wercker
Merge branch 'master' of github.com:nlamirault/emacs-travis

Conflicts:
	ChangeLog.md