Add a lein test alias that runs both expectations and cucumber features, but doesn't do a clean first.
Merge branch 'master' into dev

Conflicts:
	project.clj