fixed weird indentation thing on code blocks
Merge branch 'gh-pages' of https://github.com/gerbal/spring2014 into gh-pages
removed cruft file