Update for Scala 2.11. Merge Manos bug fixes and improvments including type casts. JSON temporarily disabled.