Update from si-imac.home.simonszu.de (Fr  8 Nov 2013 12:14:31 CET)
Merge branch 'master' of github.com:simonszu/dotfiles