Mavenization
Merge branch 'master' into james-dev
Merge pull request #7 from twotoasters/james-dev

Mavenization