Update FindCPLEX and cplex-shared to deal with the two different osx installers (yielding in x86_64_darwin or _osx paths), and to successfully link the shared libcplex against libstdc++
Merge pull request #27 from chaubold/upstream_master

Update FindCPLEX and cplex-shared to deal with the two different osx ins...
Add janelia logo
Removed obsolete patchfile: cylemon.patch
ilastik.cmake: Changed remote url to ilastik/ilastik-meta, not janelia-flyem/ilastik
adds drmaa python
opengm.cmake: Compile with hdf5, boost, and python
readme: Updated environment settings info for building on the janelia cluster.
Update go to 1.2.1
Added jsonschema.cmake
ilastik.cmake: Added a new dependency: jsonschema
ilastik.cmake: Require opengm
opengm: Build without CPLEX if it can't be found.
adds support for libdvidcpp
vigra.cmake: Explicitly set several cmake variables that locate libtiff, libpng, etc.
qt4.cmake: Don't skip qt-accessibility.
updates default boost -- vigra and neuroproof tested
adds atomic boost library for cppnetlib
Update psutil to fix https://github.com/ilastik/ilastik/issues/891
Merge commit '069e9087342e8869869c457ea543fe59579ff958' into fix/OSX10.9

Conflicts:
	FindCplex.cmake
	opengm.cmake
	vigra.cmake