minor
Merge branch 'master' of github.com:dlwh/epic

Conflicts:
	src/main/scala/epic/features/StandardSurfaceFeaturizer.scala
jesus, i don't even know
lex actually works now?