Merge pull request #4 from jwilsson/master

Replace more uses of file_get_contents()
Minor code consistency updates