Fixed makefile so that user pdfs are targets, don't get deleted automatically
Merge branch 'master' into testing