Minor changes to Josh's great work on this.
Merge pull request #1 from topping/wip-jsuereth-uberOsgi

PR for minor updates