File cleanup from merge
Merge branch 'master' of https://github.com/ajbowler/M14 into node-proxy