Improve the Makefiles

Merged Philip Müller requested to merge MightyCreak:master into master

Created by: MightyCreak

There are two commits, one to handle vim's swap files in .gitignore and one to improve a bit the Makefile modularity. Everything is explained in the commits.

Cheers!

Merge request reports