Merge pull request #3 from gjbex/development

Development
Simplified build, now appropriate config file has to be put in place
Merge pull request #4 from gjbex/intel_build

Intel build