i3 setup on xps15
vimrc to new vundle version
Don't set a background colour in vim
add ack grep and improve easymotion bindings
set default monitors for workspaces
don't reference username in home path
use custom tmux powerline theme
make comment colors better
pull env specific stuff and aliases out of bashrc
update gitconfig with all the madness
specific changes for laptop
Merge branch 'work'

Conflicts:
	i3/config
Asynccommand requires specific compilation
Merge branch 'XPS15'

Conflicts:
	bashrc
	i3/config
	i3/conkyrc
	tmux.conf
	vimrc
uniquely name workspace bindings
set terminal to use $term value in bindings
sync xresources
don't keep user in global git config, we use different emails for different projects
always get bg image from ~/desktop, and symlink it
transparent tmux bar working