Merge branch 'release-0.1.4'
removed psr-0 and added classmap
Version bumped from  0.1.4 to 0.1.5
Merge branch 'release-0.1.5'