Merge remote-tracking branch 'origin' into air
vimrc: remove tagbar plugin and don't set filetype off
Merge remote-tracking branch 'origin/master' into air
add bluez.py script
Merge remote-tracking branch 'origin/master' into air
correct neobundle.vim url in submodule config
Merge remote-tracking branch 'origin/master' into air
i3status: update temp1_input path
vim: add .vim/bundle.local symlink
Merge remote-tracking branch 'origin/master' into air

Conflicts:
	shell/.xinitrc
Merge remote-tracking branch 'origin/master' into air

Conflicts:
	shell/.xinitrc
Merge remote-tracking branch 'origin/master' into air