Merge pull request #99 from christophercurrie/2.2

OSGI support. Fixes #98
Snapshot resolvers in travis config
Reversing travis command line.

Setting the resolvers seems to clobber the Scala version
setting, causing all builds to use the default 2.10.2.
#97 Types in Maps