CHORE: update gitignore file

.gitignore

-# IntelliJ
-.idea/
-*.iml
 
 # Puppet downloaded modules
 modules/
 
 # Vagrant internal files
 .vagrant/
-ubuntu*.log
+*.log
+
+
+##### IDE / Text editor
+
+# Intellij
+.idea
+*.iml
+
+# saved files
+*~
+*.bak
+*.swp
+
+
+##### GIT
+
+# Git - Merge temp file
+*.orig
+
+# git shortlog -s -n
+#  	file for map author and committer names and email addresses
+#  	to canonical real names and email addresses
+/.mailmap
+
+