Better way to fix a 'return from incompatible pointer type' compiler warning for const return types.
Merge pull request #30 from jlesage/compiler_warning_fix

Better way to fix a 'return from incompatible pointer type' compiler warning (Thanks again, Jocelyn! This seems to work on the compiler that was having problems before. I'll merge it and see how it does across the system)
* If people are asking us to do things like "const char const *", then we shouldn't further complain about it.
- cmock now accepts any combo of yaml and command line options, applying them in the order they appear on the command line (thanks kylebhamilton for the suggestion!)
Fixed usage of ReturnThruPtr when also using ExpectAnyArgs (thanks for noticing this one, jlesage)
Fix error where we would get errors if we IgnoredAndReturned a function and then never called it. stupid eh? ( thanks for bringing this up, smaankers)
Make sure CMock releases its dynamically allocated memory at the end of the entire suite.
update to latest unity
Fixed another 'return from incompatible pointer type' compiler warning generated by ExpectAnyArgs plugin.
Make sure *_IgnoreBool is (re)set to 0 when adding base expectations.
This way, a call to *_IgnoreAndReturn() followed by a call to *_ExpectAndReturn() is properly handled (i.e. the function will not be ignored, as instructed by the last statement).
Merge pull request #34 from jlesage/reset_ignore_bool

Make sure *_IgnoreBool is (re)set to 0 when adding base expectations. (Thanks Jocelyn!)
Merge pull request #33 from jlesage/cast_return_type

Fixed another 'return from incompatible pointer type' compiler warning (Thanks Jocelyn!)
Properly merge options.
Merge pull request #35 from jlesage/options_fix

Properly merge options. (Thanks SO MUCH. I can't believe I missed that one)
Adjust source file to be able to properly strip macros when using strippables.
Merge pull request #36 from jlesage/strippables_regex_fix2

Adjust source file to be able to properly strip macros when using strippables (An elegant solution, Jocelyn!)