This is the rebased version of rm-antbuilder

Use this to address #44