fix unit test + some code cleanup
Merge branch 'randy/http-server-live-dev' of https://github.com/adobe/brackets into randy/http-server-live-dev