Even more awesomeness

Cards handle absolute position better (still need to fix card slots)
Lots of model shenanigens
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/card.py
	models/card.py