bumped the next dev version
Merge branch 'dev' into features/heka-stdliblogging

Conflicts:
	CHANGES.rst