Cleaned out eroneous text
Updated to Scala 2.11
Merge remote-tracking branch 'upstream/master'
Merge pull request #52 from adamretter/master

Updated to Scala 2.11