add functionality for specifying attributes
Merge branch 'master' of ssh://github.com/ahankinson/imageserve

Conflicts:
	imageserve/admin.py