Handle tags and comments
Handle tags and comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	old/fieldlist.jsx
	old/test/fieldlist.jsx
Don't ignore dist so npm install is not necessary to run the site.