Add some basic styling
added leaflet-src for development
basic popups
Merge branch 'master' into popups
added crenvu to biodiversity lens
removed http from topojson address
merge tims styles
Merge pull request #6 from unepwcmc/popups

Popups
Merge branch 'master' of github.com:unepwcmc/MacarthurWatersheds
conflict leftover?
reverting map_view to before tim-styles merge
Merge branch 'master' into ui-design

Conflicts:
	coffee/src/templates/region_chooser.hbs
	css/application.css
	index.html
	js/templates.js
added gulp-sass to package.json
Merge pull request #7 from unepwcmc/ui-design

initial styling
Merge branch 'master' of https://github.com/unepwcmc/MacarthurWatersheds into ui-design

Conflicts:
	config/.DS_Store
	package.json
further styling changes - test to see if gulp is watching changes