Merge branch 'master' into peter
Forgot one semicolon....

AARRRRGGGG!!!

Oh, and still make plot scripts
Merge branch 'peter'