resolve merge conflict in mapbox PR#1

Merged

ycabon merged 5 commits intoEsri:clipping-logicfrom

jgravois:conflict

Apr 22, 2016

Commits on Nov 11, 2015

upgrade travis config for more targets
mourner
committed

Commits on Dec 10, 2015

Commits on Feb 9, 2016

Add eslint
tmcw
committed

Commits on Apr 22, 2016

Merge remote-tracking branch 'mapbox/master' into conflict
jgravois
committed