Merge branch 'master' of github.com:jkoelker/quark

Conflicts:
	quark/plugin.py
Merge branch 'master' of github.com:roaet/quark

Conflicts:
	quark/plugin.py
A few more whacks at modeling