remove zprezto symlinks
rename all sorts of stuff
add bootstrap.sh and clean.sh
remove .pentadactyl folder
mv .vim to vim
update readme
push to current branch by default
remove unused stuff from pythonrc
mv .zprezto to zprezto
Merge branch 'master' into air

Conflicts:
	.zprofile
	vim/bundle/acp
	vim/bundle/command-t
	vim/bundle/dbext
	vim/bundle/jedi-vim
	vim/bundle/linediff
	vim/bundle/puppet-syntax
	vim/bundle/tagbar
	vim/bundle/vim-flake8
	vim/bundle/vim-fugitive
	vim/bundle/vim-powerline
	vim/bundle/webapi-vim
add bin/pres.sh and Xresources-solarized
Merge branch 'master' into air