final touch ups
Merge branch 'master' of github.com:AlienHoboken/divvy
final touch ups