more setup stuff
Merge branch 'master' of https://github.com/andywarthol/activecare