Adding ability to edit artists
Merge branch 'jmp' of https://github.com/Parametric/PyCamp into jmp

Conflicts:
	pycamp.db