Merge pull request #488 from jeremygray/master

BF: use python2 in shebang in Builder-generated scripts; closes #486
DOC: rst for demo style guide