Add category page changes
Merge branch 'master' of git://github.com/MageHack/elasticmage