Adapt to Ubuntu 13.04
Merge branch 'master' of github.com:thomedes/dotfiles