Remove undefined var from LESS
Change deploy so jobs don't export. It's been going awry.
Merge branch 'design' into develop
Move images from public/images to app/assets/images, so it can serve properly
Restructure images, fonts, etc. to conform to the Rails asset pipeline
Point leaflet markers to local source, so that 2x renders (hosted mapbox does not have this)
merging all 2 develop/design
Merge branch 'pr/6' into design

Conflicts:
	app/.DS_Store
	app/assets/.DS_Store
	app/assets/javascripts/backbone/.DS_Store
	app/assets/javascripts/backbone/apps/.DS_Store
	app/assets/javascripts/backbone/apps/fstations/list/list_view.js.coffee

app/assets/javascripts/backbone/apps/header/list/templates/headers.jst.e
co
	app/assets/javascripts/backbone/apps/main/search/search_view.js.coffee

app/assets/javascripts/backbone/apps/main/search/templates/simple_search
_layout.jst.eco

app/assets/javascripts/backbone/apps/search/search/search_view.js.coffee

app/assets/javascripts/backbone/apps/search/search/templates/simple_sear
ch_layout.jst.eco
	app/assets/javascripts/backbone/apps/search/search_app.js.coffee
	app/assets/stylesheets/apps/main.less
	db/fixtures/station_areas.csv
	db/schema.rb
	db/seeds.rb