updates for Nathan
Merge branch 'rc2' of github.com:guardianproject/InformaCam into rc2