modified:   gitconfig
modified:   gitignore_global
modified:   iseetheline.sh
modified:   mvorax.sh
modified:   vim/bundle/vorax4-beta
new file:   vim/snippets/sql.snippets
modified:   vimrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc