Merge pull request #487 from jeremygray/master

BF: use wxversion.select in _psychopyApp; closes #485
BF: use python2 in shebang in Builder-generated scripts; closes #486

thanks @danielshub