Bret Cohort Data#2

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

BretRunestad:masterBretRunestad/cohort-data:masterCopy head branch name to clipboard