evaluate now!
Merge branch 'master' of github.com:dlwh/epic

Conflicts:
	src/main/scala/epic/parser/ParserPipeline.scala