init
adds setup script
adds .gitconfig and updates bash_profile and .gitignore
adds pathogen and nerdtree
Merge branch 'master' of github.com:relekang/dotfiles
adds solarized
sets solarized as default
updates .vimrc with NERDTree stuff
adds server aliases
add venv to gitignore
update .bash_profile
remove ; from aliases
update .bash_profile and gitignore
Merge branch 'master' of github.com:relekang/dotfiles
update bash_profile
Merge branch 'master' of github.com:relekang/dotfiles

Conflicts:
	.bash_profile
update bash_profile
add more git stuff
Update .bash_profile
Merge branch 'master' of github.com:relekang/dotfiles