Updateed test styles, cleaned up code
fix overflow error in labeler
smarter selection/insertion of new graph vertices on zoom. temporarily disable grid snapping
halo-ing of labels
label orientations field in styler
allow label placement over segments
Removed Haloing, simplified default styles
prevent places and nearby stop markers from overlapping
Rules dont have to be arrays
Refactored styles for single definition rules
Merge branch 'master' of github.com:conveyal/transitive.js
Merge branch 'master' into gh-pages

Conflicts:
	test/style.css
Updated gh-pages