Big update, remove migrations for artifacts as it doesn't place nice with geodjango
Merge remote-tracking branch 'origin/master'