Updating Version Number
Update Travis Image
Update README.md
Merge branch 'develop'

Conflicts:
	README.md
Accidentally committed a conflict.
Merge branch 'develop'
injectNoparse needed to be static.
Put the changelog in the normal order.
Merge branch 'master' into develop