more work on travis compatibility and nginx config
Merge branch 'master' of ssh://github.com/iliakan/javascript-nodejs into production