OSGI support. Fixes #98
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
#97 Tuple content types
#95 Guava module
Test for #90
Fix for #90
Unstable prop ordering
More unwrapped testing
Merge branch '2.2'