Merge pull request #35 from mhuerster/caching-spike

Caching spike
Merge branch 'development' of github.com:red-spotted-newts-2014/bike-path into caching-spike