lots of changes to testclient
attr and ignore file is restored
Merge branch 'master' of https://github.com/royb3/Energy_Vampires