Fixed failed tests in engine
no double set-up
fixed a few more errors in test_views
Merge branch 'engine_impl' of https://github.com/courageousillumination/deckr into engine_impl
Fixed various unittest failures.
Fixed merge conflicts.
Merged in master.