More abstraction for path to traits list
Update surveys used by demo.py
Merge branch 'master' of github.com:madprime/pgp_survey_analysis