get redcarpet and coderay installed and working
get blog index view working, insert into front page
make blog index partial
remove bloggy stuff
remove cancancan gem to facilitate merge with master
remove cancancan to facilitate merge with blog branch
remove coderay for merge w/ master
bundle to make previous commit stick
fix merge conflict in welcome/index.html
add blog routes back in, shit is fixed? I think?