Whitespace and tramp updates
Javascript environment
Merge branch 'master' of github.com:wocoburguesa/woco-emacs

Conflicts:
	init.el