included changes from master
Merge branch 'cli-app-refactor' of github.com:CraZySacX/overbuild into cli-app-refactor

Conflicts:
	src/org/overbuild/builder/mongo.clj
	src/org/overbuild/builder/node.clj
project.clj formatting