refactored views; hopefully doing it right, no more zombies
Merge branch 'master' of github.com:boskonyc/expo