commiting before pulling from github
Merge branch 'master' of https://github.com/psophis/dotfiles

* 'master' of https://github.com/psophis/dotfiles:
  Added vim-colors-solarized
  Changed vimrc and added tmux.conf

Conflicts:
	vimrc
Added vim submoduals

auto-pairs
snipmate.vim
vim-markdown