Code cleanup, updated package.json.
Merge branch 'master' of https://github.com/delvedor/Chateo