Update Ada per styleguide - no apostrophe, no all-caps.
Merge branch 'master' into gh-pages