Migrate camera to tap
PEP8 fixes
Merge pull request #280 from davehunt/pep8

PEP8 fixes
Merge pull request #276 from zacc/camera_click_to_tap

Migrate camera to tap
Merge remote-tracking branch 'upstream/master' into cards_view_tap_fp