results merge code fixes
Merge branch 'master' of github.com:bazaarvoice/bythebeardofazel