Installed pathogen
Ignoring local .net file
Added indentation rules for javascript and html
Added node.js plugins to vim
Merge branch 'master' of github.com:Crackerz/vim

Conflicts:
	.vimrc