fixed all feature warnings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/scala/com/fdilke/scala/FelixMatchers.scala