Merge pull request #18 from ambertunnell/ben_branch

Tweets can be deleted from the dashboard and persist in the db
fixes comma error
Merge branch 'master' of github.com:ambertunnell/worldview
new clock faces and SF commented in html
Added cities and cityuser table. update seed for cities
Merge branch 'master' of github.com:ambertunnell/worldview
Autocomplete test works, need to integrate with real cities model
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Added ~300 cities for autocomplete test data
initial grid
Merge branch 'master' of github.com:ambertunnell/worldview
APIs rendering within contained grid
Merge branch 'stylinggridetc'
Fix merge conflicts from something or other