Commented sinatra. workman API is not being used
Merge branch 'leapfrog-faster-cartodb' of github.com:CartoDB/cartodb into leapfrog-faster-cartodb

Conflicts:
	Gemfile.lock
Merge branch 'leapfrog-faster-cartodb' of github.com:CartoDB/cartodb into leapfrog-faster-cartodb

Conflicts:
	Gemfile.lock