Added ultisnips module
Added solarized color scheme
Added javascript syntax plugin
Javascript filetype config
Merge branch 'master' of github.com:olesu/vim

Conflicts:
	ftplugin/javascript.vim
Ignore dirty