Merge branch 'master' of https://github.com/AVVSDevelopment/node-elasticinbox into avvs-pull
Reformatted code
Merge remote-tracking branch 'upstream/master'