Finished as much as I could.#3

brundleflytelepod wants to merge 2 commits intotiyd-python-2015-01:mastertiyd-python-2015-01/cohort-data:masterfrom

brundleflytelepod:masterbrundleflytelepod/cohort-data:masterCopy head branch name to clipboard