had the edit/delete links backwards, jeez dave get with it
Merge branch 'master' of https://github.com/walkerart/mnartists

Conflicts:
	sites/default/themes/mnartists/templates/views-view-fields--flag-lists-user-lists.tpl.php