updated to use scala 2.11.1

[jodersky@gmail.com: remove extra dependencies to parserCombinators]
Merge branch 'photex-master'