Fix issue #46 and Fix issue #47
remove pre/code CSS in style.css in favor of Octopress CSS
Publish Marconi/salt post
Merge branch 'master' of github.com:rackerlabs/devsite
Merge remote-tracking branch 'upstream/master'