using browserify everywhere
Merge branch 'develop' of https://github.com/CartoDB/VECNIK into develop

Conflicts:
	test/core.spec.js
lint fixes
lint fixes
detecting label positions

...not dealing with clipping yet
Merge branch 'develop' of https://github.com/CartoDB/VECNIK into develop

Conflicts:
	src/main.js
	test/core.spec.js
	test/suite.html
merge fix