pkinnear merging master to devel, as I'd been working on my new plotting notebook on the master branch (my bad!)