Merge pull request #70 from chuckdumont/master

Fix for issue #69 (NPEs when serializing cache)
Merge pull request #71 from chuckdumont/master

Fix logic error in URL splitting code
Changes to support running with felix gogo console