update year
cleanup a few things after recent changes
Merge branch 'master' of github.com:stephenfewer/grinder
Merge branch 'master' of github.com:stephenfewer/grinder
Merge branch 'master' of github.com:stephenfewer/grinder
keep the changelog updated with some recent contributions.