Jekyll to 2.0.
Bumped rake version to 10.3.1.
Whitespace in .travis.yml.
Merge branch 'master' into demo