reworded auth denial text
added none to comp-op setting
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge pull request #58 from agoddard/develop

reworded auth denial text
Puts the nokia map to the top of the list
Changes default basemap to Nokia on app_config.yml.sample
Merge branch 'develop' into release/staging