Minor optimizations, removed WorldPlugin from defaults, fixed demo.py
Merge branch 'master' of github.com:nickelpro/spock