Merge remote-tracking branch 'origin/master' into umaster

Conflicts:
	README.md
Merge branch 'master' into umaster
Merge branch 'master' of https://github.com/nitrogenjs/oxide into umaster
Ignore environment.js
Removed environemnt
Merge branch 'master' of https://github.com/nitrogenjs/oxide into umaster
Fixing up problems from jshint and latest round of fixes.