nessisary changes to make compilation possible on ubuntu 3.11 install with opencv from repository.
Still needed to make a softlink in /usr/include from opencv to opencv2
working on osx