WIP
Merge branch 'master' into sbt-plugin

Conflicts:
	project/Build.scala
	src/main/scala/scoop/ast.scala
Removed extra file
Finished the basic sbt plugin
Fixes
Don't generate unless clean (or brand new) or called explicitly