Remove conflict marker from FAQ

git-svn-id: https://cantera.googlecode.com/svn/cantera/branches/2.1@3251 02a645c2-efd0-11dd-984d-ab748d24aa7e
[Doc] Update OS X installation instructions to fix finding Sundials

Cherry-pick of trunk r3248.

git-svn-id: https://cantera.googlecode.com/svn/cantera/branches/2.1@3252 02a645c2-efd0-11dd-984d-ab748d24aa7e
[Doc] Add instructions on adding Homebrewed Cantera to the Matlab path

Cherry-pick of trunk 3249

git-svn-id: https://cantera.googlecode.com/svn/cantera/branches/2.1@3253 02a645c2-efd0-11dd-984d-ab748d24aa7e
[Doc] Describe paths to examples for Homebrewed installation

Cherry-pick of trunk r3250.

git-svn-id: https://cantera.googlecode.com/svn/cantera/branches/2.1@3254 02a645c2-efd0-11dd-984d-ab748d24aa7e