modifies vimrc for filetype javascript
replaces centering hardstatus by left captions
Merge remote-tracking branch 'origin/master' into cana

Conflicts:
	.screenrc
adds bin/catimg
replaces protocol s/https/git/
adds keymap for caret-hint.js
Merge remote-tracking branch 'origin/master' into cana