CDB-1788 - service oauth process almost complete
Merge branch 'CDB-1788' of github.com:CartoDB/cartodb into CDB-1788