fix bug 873717 - Pull tabzilla from CDN
Remove unwanted waffle
Minor base updates
Merge pull request #1105 from darkwing/tabzilla-cdn-873717

fix bug 873717 - Pull tabzilla from CDN
Merge pull request #1106 from darkwing/remove-waffle

Remove unwanted waffle
Merge pull request #1107 from darkwing/base-updates

Minor base updates