better handling for the bounds drawing

and clearing
Merge branch 'master' into grand_variable_unification

Conflicts:
	app/assets/javascripts/maps.js.coffee