Revert "Prevent incompatibility issues with c++11"

This reverts commit 3b45e320964edee7cd9b114935ead200ff8e9c3a.

Remove define/undef since they cause an error in the launcher's
compilation with the current bundler script that uses boost 1.56.0
Merge branch 'ivanalejandro0/bug/remove-defines' into develop
Fold in changes
Merge branch 'release-0.3.2'