Added maven, small cleanup.
Merge pull request #1 from TehRainbowGuy/master

Implement maven and a small cleanup.