Dev checkin
Merge branch 'develop' of github.com:emrainey/OpenCL-Environment into develop
[CONCERTO] Fixes to use external concerto
[README] Updates to readme
[MERGE] Merged develop to master