git ignore updates
Merge branch 'linux' of github.com:noren/dotfiles into linux

* 'linux' of github.com:noren/dotfiles:
  updated git ignore