version bump
Merge branch 'master' of github.com:jordansissel/lumberjack

Conflicts:
	Makefile
.