Remove basedir from build.xml
Remove some extra comments
Merge branch 'master' of https://github.com/thenickperson/templates