add asides back in for now (still not sure of how they'll work out with bootstrap)
blog post starter template moved to examples
load example category index
add _includes/xml for xml templates
update category generator with correct path
merge upstream changes