fix templating syntax error
use silly line breaks to make the parallel clearer
provide default LOCALES
Merge pull request #450 from PyBossa/fix-i18n-template

fix templating syntax error
Merge pull request #451 from mk270/fix-locale-default

provide default LOCALES
PEP-8 Compliant. Refs #454
Fix to load only the requested importer. Closes #454
Merge pull request #455 from PyBossa/issue-454-importers

Issue 454 importers
manually merge PEP8 bump
add separate forms for each import handler
pass template through to worker function
deconflate the two concepts mixed up in templates
adapt tests to changed interface
disable broken test temporarily
Merge pull request #456 from PyBossa/generalise-importers2

Generalise importers, phase 2
Merge commit '9fc4' into culttag-redux
manual merge
manual merge