Readablility fixes to swtmaker.js
Merge branch 'master' of github.com:janastu/swtr

Adding support for tagging images through a list of keywords specified
in an ontology.
Adding bootstrap-tags library for displaying tags.
Merge branch 'ocd' of github.com:janastu/swtr into ocd

Conflicts:
	swtr/static/js/lib/custom-fields-plugin.js
	swtr/static/js/swtmaker.js
	swtr/templates/index.html