frantic last minute page tweaking
fixed merge conflict
Merge pull request #28 from jonnyparris/travis

frantic last minute page tweaking