Merge branch 'master' into openpgp

.gitignore

@@ -4,73 +4,53 @@
 # exclude patterns (uncomment them if you want to use them):
 # *.[oa]
 # *~
-profanity
+
-profanity.sh
+# IDE
-*.o
-*.log
-*.swp
-testsuite
-tags
-cscope.out
-.deps/
-build-aux/
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-src/config.h
-src/config.h.in
-config.status
-configure
-configure.scan
-stamp-h1
-*~
-*dirstamp
-valgrind*.out*
-core
-bugs/
-TODO
-plugins/
-*_key.txt
-*_fingerprints.txt
-src/gitversion.h
-src/gitversion.h.in
-*_key.txt
-*_fingerprints.txt
-TAGS
-.libs/
-_configs.sed
-libprofanity.la
-libtool
-runvalgrind.sh
-src/prof_config.h
-clean.sh
-valgrind.out.old
-tests/testsuite.trs
-push-all.sh
-.DS_Store
 .codelite/
-Profanity.project
-Profanity.workspace
-profanity.project
-profanity.workspace
-pageing.txt
-cppcheck.out
-gitpushall.sh
-Debug/
-compile_commands.json
 profanity.mk
 profanity.project
 profanity.workspace
+
+# autotools
+.libs/
+Makefile
+Makefile.in
+_configs.sed
+aclocal.m4
+autom4te.cache/
+build-aux/
+config.log
+config.status
+configure
+libprofanity.la
+libtool
 m4/
-test.sh
+**/.deps/
+**.dirstamp
+src/config.h
+src/config.h.in
+src/gitversion.h
+src/gitversion.h.in
+src/stamp-h1
+
+# binaries
+profanity
+**/*.o
+
+# test output
+functionaltests/functionaltests
+functionaltests/functionaltests.log
+functionaltests/functionaltests.trs
+unittests/unittests
+unittests/unittests.log
+unittests/unittests.trs
+test-suite.log
+
+# local scripts
 clean-test.sh
-callgrind.out.*
 gen_docs.sh
+gitpushall.sh
+
+# website files
 main_fragment.html
 toc_fragment.html
-unittests/unittests
-unittests/unittests.trs
-functionaltests/functionaltests
-functionaltests/functionaltests.trs
-