var name clean up
Merge branch 'cindex' of github.com:chuckcranor/plfs-core into cindex