updated .gitignore to ignore .aux (LaTeX build files) and conflicted copies from dropbox.