removed line endings requirement in lint
fixed merge conflicts
added flag to prevent multiple openings of browser
Merge branch 'feature-infusionsoft' into rock-rest
Merge branch 'rock-rest' of github.com:NewSpring/newspring-node into rock-rest