Merge pull request #2 from willthames/generalisation

Allow easier local customisation
Merge branch 'master' of https://github.com/barmstrong/octopress-bootstrap