Cleaned gitignore and added emacs files to it
Formatting to 80 columns
Merge pull request #1 from Association-Atilla/dev-vivien

Merge Dev vivien: various clean-ups