Merge pull request #13 from mhuerster/master

Mostly formatting changes
Merge branch 'master' of github.com:red-spotted-newts-2014/bike-path