14 september 2014

Updated make files and .gitignore. Removed tracking on *.oxo* files. Merged into master so updates stay  manageable.