fixing push setting
2U project settings.

Conflicts:

	.bash_profile
	.bashrc
	.vim/vundle.vim
	.vimrc
hopefully useful fab alias
syntax highlighting for less.
useful scripts
Changed directory names.
Improving my git setup

Conflicts:

	.vimrc
fixing path

Conflicts:

	.gitconfig
useful alias for running all api tests.
improving pretty-git-log
Merge branch 'master' of https://github.com/verdammelt/dotfiles into cyrus-project-2u
Improving the git log function.