awesome
luakit
termite
Merge branch 'master' of github.com:rdamen/dotfiles

* 'master' of github.com:rdamen/dotfiles:
  vim
  awesome
  vim/termite colors
  pentadactyl
  vim
  luakit

Conflicts:
	awesome/.config/awesome/rc.lua
	luakit/.config/luakit/binds.lua
	luakit/.local/share/luakit/quickmarks