Tags are imported in machines. Admin has been updated for some core models to be more useful
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere