Merge pull request #52 from modilabs/coffee

Coffee,
self merge engine room style
Merge branch 'master' of github.com:modilabs/nmis into leaflet