fixing version issue (forgot to check in these changes) fixes #154
fixing broken travis build
fixing CHANGELOG and adding note about label_errors. fixes #155
Merge remote-tracking branch 'upstream/master' into required_label_asterix

Conflicts:
	CHANGELOG.md