Update endwise version 1.0 -> 1.1
Update rails.vim plugin
Update nerdtree version
Update Rename.vim
Update Tabular.vim
Update taglist plugin
Modify permissions
Replace snipMate with UltiSnips
Updates to vimrc
New UltiSnips trigger
Add ignore wildcards (.pyc and .zwc)
Disable ISO 14755 mode
Minor comment change
Merge branch 'master' of github.com:chunyang/dotfiles

Conflicts:
	.gitignore
Remove ycm_extra_conf.py