Simplify demo a bit more
Add keywords to setup.py