a little bit of code cleanup
Merge branch 'gh-pages' of https://github.com/gerbal/spring2014 into gh-pages