Changed reshape function to properly size the array
Merging code from home with code from work

Merge branch 'master' of https://github.com/DawesLab/PythonForPicam