some optimizations after tag consolidation, removal of DrupalNodeTag code publiclab/plots2#93
more optimizations/fixes for publiclab/plots2#93
:Merge branch 'master' of github.com:publiclab/plots2

Conflicts:
	app/models/drupal_node_tag.rb
prompt people to add tags to untagged content close publiclab/plots2#82