QA updates to the pricing page.
don't redirect for automated tests.
resolve merge conflicts.
remove cached files.
Remove ui tests from unecessary pages.
Merge pull request #695 from optimizely/krush/null

QA updates to the pricing page.