update deps
update to express 4
update mocki dep
add sys.js
Merge branch 'master' into es6-please

Conflicts:
	bower.json
	package.json