consolidate Paul Irish's dotfiles with Mathias', and remove what is not needed