Add FileType options for javascript
Add vim-json plugin
Add colorcolumn to programming filetypes
Merge branch 'master' of github.com:wfscheper/dotfiles

Conflicts:
	_vimrc