Merge pull request #38 from jhogendorn/master

Updates and fixes
Reshuffles everything in a sort of multiblog format. Kind of breaking jekyll a bit, and I dont see the reason to have it set up like this. Kind of following on broken convention