Remove merge conflict in code
Merge pull request #246 from notthatbreezy/topic/location-fix

Topic/location fix
Add common.debounce, minor cleanup
Make map/list update nb/locations
Remove git garbage
Add full faq fixture with translations
Fix problem with foreign keys
Add ansible command to load FAQ fixture
Remove unused FAQ fixtures
Merge pull request #247 from bhuber/topic/filter-updates

Topic/filter updates
Change zoom threshold to slightly further out
Update translation files
Delete v1 files

Was creating unnecessary translation messages
Delete v1 urls file
Add translations to location model

- Make sure to create message strings for all fieldnames
- Add fieldname translations to context dictionary
- Add other non-fieldname strings as translatable
Add fieldname for boolean fields so it gets translated

This is a workaround so that 'Other Features' gets translated
by Django when constructing the json response
Add/edit translation blocks for templates
Add reload of current page when setting language

Previous code was returning user to homepage when setting language
Add lazy encoder for translating django objects to json

See doctstring for more info
Bunch of styling updates plus new map markers