uncommented some stuff
grid merge conflict
synced up external libraries with octant
Merge pull request #5 from phobson/update-external-libs

synced up external libraries with octant
Merge pull request #2 from phobson/develop

Develop