[WIP] (don't merge) Fix for Ubuntu 14.04.

Need to test 12.04, and redhat, to make sure the changes to this don't break augeas.