Merge pull request #20 from greese/develop

Merge upstream dasein into twc branch for testing
Merge pull request #23 from greese/develop

merge latest from upstream
Merge pull request #24 from TheWeatherCompany/merge-down-2014-08-07

Merge from dasein upstream