trying to sync laptop. defeated by complexity of merge.
Merge branch 'master' of https://github.com/wbconnor/pcm