Merge pull request #664 from jeremygray/master

FF: wx-3.x - avoid PySimpleApp when deprecated
Merge pull request #665 from jeremygray/master

FF: remove icc profile from small-icon .pngs
BF: numpy arrays as masks weren't working; they were interpreted by opengl as floats
Merge branch 'master' of github.com:psychopy/psychopy