reformat to 4-spaces
Merge branch 'master' into mapnik-omnivore

Conflicts:
	app/source.js