Merge changes into master

Should have made these on master anyway TBH. SourceTree, Bitbucket and the command line is where I usually do my Gitting...