Merge pull request #659 from jeremygray/master

FF: adjustments for MANIFEST.in to pick up a couple files
BF: MonitorCenter.py handle notes == None