Merge pull request #18 from MarvinT/shape

shape fix: states return callables
syntax fixes in shape.py
ignore HopperWontDropError while running lights
merged
Merge branch 'shape' of https://github.com/gentnerlab/pyoperant into shape