Merge upstream20140708

Looks like there's an option in there to turn off search indexing (https://github.com/kehh/providence/commit/59d4b7d2ee028bc664a23efa2857ebea2b4d435d) on import plus a whole bunch of cacheing in the model and data importer. Bodes well for future imports.

Will also do a PR for the local conf as the javascript.conf changed.