bump
Merge branch 'master' of https://github.com/abeiderman/flotsam

Conflicts:
	README.md