chore(ui): Improved site secret UI for master after 1.8 merge.

Refs #6443
chore(travis): Ignoring all merge commits.

Refs #5976
Merge pull request #6564 from brettp/ignore_merge_commits

chore(travis): Ignoring all merge commits.
Merge pull request #6563 from brettp/site_secret_master

chore(ui): Improved site secret UI for master after 1.8 merge.