Now excluding configuration files
Minor changes. Local commit
Merge with master
Solved merge problem
Added size_t in defs.h for things to compile
Added extra types to the .gitignore