Simplify build; upgrade to scala 2.11.1. Remove plugin to enable scala 2.11