Update from simarch (Do 28. Nov 13:21:44 CET 2013)
Merge branch 'master' of github.com:simonszu/dotfiles