Merge branch 'master' of
https://github.com/sbeimin/Amazon-S3-FileSystem-NIO2

Conflicts:
	pom.xml
apparently the previous merge didn't work...
Fixed some unittests to get 100% coverage again
Merge branch 'master' of
https://github.com/sbeimin/Amazon-S3-FileSystem-NIO2.git

Conflicts:
	pom.xml