Adds .tmux.conf
Adds force to ln -s
Merge branch 'master' of git.cashnetusa.com:cgavrilescu/mydotfiles

Conflicts:
	install.sh
Force rm ~/.vim so we don't get link to vim in our directory
set mode keys to vim mode
adds pgsql editor for syntax highligting
Changes from cvm: prompt path changes
Merge branch 'master' of git.cashnetusa.com:cgavrilescu/mydotfiles
Adds rvm path
Merge branch 'master' of git.cashnetusa.com:cgavrilescu/mydotfiles into no_cnu
Merge branch 'master' of git.cashnetusa.com:cgavrilescu/mydotfiles into no_cnu
if /etc/cnu/cnu_env does not exist, do not complain in prompt
Upgrades to a new rails.vim
Adds rabl syntax highlighting
Updates cucumber vim
Updates surround.vim
Commiting to move to another box
Merge branch 'master' of git.cashnetusa.com:cgavrilescu/mydotfiles
Adds time to bash prompt, adds color to git branch
Adds support for arduino files