beginnings of capabilities detection
cleanup
Merge branch 'master' of github.com:jjg/vpex