Some old changes, don't know what they do
Changes to Makefile options
Add more test data
Updating .gitignore
Improved build targets organization