ignore dropbox files
Merge branch 'master' of git://github.com/eddiemonge/DOT.files

* 'master' of git://github.com/eddiemonge/DOT.files:
  moved osx stuff to .osx