Hackily combining mathiasbynens/dotfiles with my changes and paul's