bug fixes for decorator.
Merge branch 'master' of https://github.com/mobyinc/Holiday-Site-2013