added twitterish functionality
Merge branch 'master' of https://github.com/kathrynsiegel/concierge

* 'master' of https://github.com/kathrynsiegel/concierge:
  more merge conflicts
  table data
  loading data for table views