Minor cleanup.
Merge branch 'master' of https://github.com/Adron/junction
Merge branch 'master' of https://github.com/Adron/junction
Disabling code analysis until it is setup on the server.