Merge pull request #59 from avaleske/master

Master
Merge pull request #61 from avaleske/develop

merge develop to staging
adding stuff for celerycam
Merge pull request #62 from avaleske/staging

Staging