Merging in fix to all measures with stratified sub-measures which now passes cypress

Squashed commit of the following:

commit fd1782ad176d3e07d897fcffc31fa6e58a893a43
Author: David Rom <david.rom@kareo.com>
Date:   Tue Dec 17 18:18:34 2013 -0800

    Get all sub-measures to work

commit cbcddb051ed8c423a6a3c878f8a897e9948527b0
Author: David Rom <david.rom@kareo.com>
Date:   Tue Dec 17 17:33:27 2013 -0800

    First step towards getting better stratification handling (still need to get chlamydia to work)

commit 7bf9e0dc092dfdc94655b029446d2069a2452270
Author: David Rom <david.rom@kareo.com>
Date:   Tue Dec 17 13:17:42 2013 -0800

    Next iteration to further group by stratification id in addition to stratified/not-stratified

commit abc04995ae479cb4bb8b2521f508b27cdce44e26
Author: David Rom <david.rom@kareo.com>
Date:   Tue Dec 17 11:29:08 2013 -0800

    Fixes from testing

commit 0a79e97e9cdae03651e35d3412fed4d4e3e08784
Author: David Rom <david.rom@kareo.com>
Date:   Tue Dec 17 10:41:24 2013 -0800

    First attempt