cleaned up code and added light/sat options
Merge branch 'master' of https://github.com/tliu91/PhotoFlow-server