Bug 726853: It's Tabzilla Time for AMO

This PR fixes git merge conflicts and renames ```#outer-wrapper``` to ```#tabzilla-wrapper``` for semantics.

@l-hedgehog's patch

https://github.com/mozilla/zamboni/pull/1030

@vinyll code review fixes

https://github.com/mozilla/zamboni/pull/1244

![screen shot 2013-10-14 at 3 26 05 pm](https://f.cloud.github.com/assets/674727/1329955/a49126e2-351f-11e3-810b-46afa4ecdad9.png)