merge fix keeps coming back…
Updating blog feed to display multiple content types and updated RSS feed to include them too
SVN up merge
Merge branch 'blog-feed'
Adding some data validation
Merge branch 'blog-feed'
Adding pagination to the blog feed
Merge branch 'hiw'
Merge branch 'master' of https://github.com/Make-Magazine/makeblog into hiw