Further changes to get augeas to work - not quite working yet