remove duplicate dependency
update version
Merge remote-tracking branch 'basho/master'

Conflicts:
	ebin/webmachine.app
	rebar.config
Fix for R16B
Merge pull request #1 from inaka/master

Ready for R16B