Simplify filetype autocmds
rename uzbl config (prevent conflicts)
Add i3 config, change wm
More vim-like bindings for window movement
Add autostart for herbstluftwm
Change wm
change modkey
Change run/close/resize bindings
Customize borders/floating. Add key binds
Text width for markdown
Merge branch 'i3' into herbs

Conflicts:
	.xinitrc
Change back to awesome
Use dmenu
Merge branch 'delta' of github.com:silverhammermba/.files into delta

Conflicts:
	.vimrc