Git push default
Added vagrant provision alias
Indentation settings for yaml in vim
Alias rename
Use system virtualenvwrapper
Merge branch 'master' into alea

Conflicts:
	bashrc