change camelCase to under_scores
Merge branch 'develop' into algorithm-time

Merge changes in from develop.
moved the fuzzy search code to the correct location

having the extension in the model directory was causing reindexing errors