Master merge

Let's see how this went... Used `git mergetool` and Diffuse from http://diffuse.sourceforge.net/