Clean up whitespace
Fix encoding bug with searches (closes #297)
Merge branch 'master' of github.com:nabu-catalog/nabu