Merge pull request #149 from Nunnery/master

ugh
Merge pull request #150 from Nunnery/bleeding

Bleeding
fixing some pom stuff
Merge pull request #152 from Nunnery/bleeding2

Bleeding2
Merge pull request #153 from Nunnery/bleeding

Bleeding