reverting macros for odeint::bind back
Merge branch 'bind'