Fix typos
Merge branch 'master' of github.com:robinkraft/cartodb into release/2.5.4