.bashrc - Added EDITOR="emacs -nw" for all those wonderful visudos
Merge branch 'master' of github.com:Rovanion/.files
bashrc - Added VISUAL=emacs
Merge branch 'master' of github.com:Rovanion/.files

Conflicts:
	.bashrc
awesome theme.lua - Corrected background path
.README - Added section about dependencies
Fixed mark tools
Merge branch 'master' of github.com:Rovanion/.files
init.el - Add hook to remove trailing whitespace before save
Changed the way the compile buffer is displayed.
Merge branch 'master' of github.com:Rovanion/.files

Conflicts:
	.emacs.d/init.el
init.el, lua-mode.elc - Added lua-mode to emacs.
Added autostart script and some applications to automatically start.
run-or-raise.lua - Moved out run_or_raise into it's own code file.
Merge branch 'master' of github.com:Rovanion/.files into 1080

Conflicts:
	.README