Tidy up the build using the Albacore DSL system