add zprezto submodule
use https for the prezto submodule

ssh won't work for others
use default Powerline colorscheme
remux.py: remux is now the default command

typing remux.py remux was too troublesome
submodule updates
xinitrc: start blueman-applet; remove workrave
add android-sdk to $PATH; add ffind/dfind functions
xinitrc: change xrandr setup to thunderbolt display
zprofile: decrypt home folder on login
submodule updates
Merge branch 'master' into air
add android-sdk to $PATH; add ffind/dfind functions
xinitrc: start blueman-applet; remove workrave

Conflicts:
	.xinitrc
Merge branch 'master' into air

Conflicts:
	.xinitrc
add SUDO_EDIT
add alias (v=fasd -f -e vim)
Merge remote-tracking branch 'origin/master' into air
vimrc: set background to dark

setting it before colorscheme solarized didn't work
Merge remote-tracking branch 'origin/master' into air
add /usr/share/eclipse/ to path variable for eclimd