Ignored tilde backup files
Merged from master
Merge branch 'feature/split_import_directory_into_subviews' into develop
Removed .couchapprc, fixed erica push error, distinguished between production and development options, made autopush push once instead of twice per change, removed couchapprc.template.
Merged from the main line.
Attempted to discover the users preferred units of distance.
Attempting to update changes to SearchView.
Attempted to find the countries which use miles.
Set the form to use miles or kilometers based upon users location.
insalled jquery-cookie
insalled jquery-cookie
insalled jquery-cookie
Use Backbone's methods to fetch and destroy all directories
Debugging
Debugging
Created cookie to store the users preference.
Editing proximity search.
Debugging
Refactoring to make code be driven by model events
More refactoring