Merge pull request #1 from m5rk/master

Various fixes
Merge branch 'master' of https://github.com/JoeCiardelli/blog