Fix typo in doxygen comment for FunctionBasedBushing.
Resolve merge conflict.
Merge pull request #236 from chrisdembia/fix-function-based-bushing-typo

Fix typo in doxygen comment for FunctionBasedBushing.