Added travis.yml so travis doesn't fail for every master branch PR and push
Added travis stamp of approval to README.
fixed issue #949 using @alexkirmse's patch
Merge branch 'master' of git://github.com/imathis/octopress
Revert "fix the selected option in mobile nav"

This reverts commit 7b530140b084d07c14338c192037880752a96e7e.
Merge branch 'master' of github.com:floydpink/octopress
upgraded to octopress master

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>