Updated changelog and version
Merge branch 'master' of github.com:faulknercs/Knockstrap