added .gitattributes to deal with merges of md5sums
added l4dtoolz (again?)
improved handling of directories in gitignore (changes not automerged from master for some reason)
merged in changes not automerged from master for some reason