Merge branch 'master' of github.com:sebmoocj/scarab

Conflicts:
	src/main/scala/com/jcs/scarab/io/ManagedResource.scala
	src/test/scala/com/jcs/scarab/io/ManagedResourceSpec.scala
Merge branch 'master' of github.com:sebmoocj/scarab