Merge pull request #655 from wraithan/master

tiny bit of code clean up
Added support for multiple categories, WARNING: this will break the
current themes, just did it because I needed it.
Merge branch 'master' of github.com:fitoria/pelican