Merge pull request #9 from caffeinewriter/dev

Removing last of the references to HF, to make this a more universal app
Merge pull request #10 from caffeinewriter/master

Merge pull request #9 from caffeinewriter/dev