Fix c-code generation for nested conditional functions
Fixed problem with operator resolution in c
Fixed the test associatied with the problem of operator resolution in c
Fixed the new code generation code now passes the test
Fixed problem with operator resolution in c
Merge branch 'fix-piecewise-ccode' of github.com:demianw/sympy into fix-piecewise-ccode
Merge pull request #1908 from demianw/fix-piecewise-ccode

Fix c-code generation for nested conditional functions
doc: Added `view' make command to preview generated HTML
doc: Added support for tikz extension

To update, copy this file:

https://bitbucket.org/philexander/tikz/raw/master/sphinxcontrib/tikz.py

to doc/ext.
doc: Added support for ipython_console_highlighting

To update, copy this file:

https://raw.github.com/ipython/ipython/master/docs/sphinxext/ipython_console_highlighting.py

to doc/ext.
doc: Added support for plot_directive Sphinx extension

To update, copy this file:

https://raw.github.com/matplotlib/matplotlib/master/lib/matplotlib/sphinxext/plot_directive.py

to doc/ext.
doc: Merged tutorial from SciPy 2011 conferences

This was merged from https://github.com/mattpap/scipy-2011-tutorial
doc: Updated and fixed SciPy tutorial examples
solvers: Fixed indeterminism in solve_undetermined_coefficients()
doc: Fixed compatibility issues (Py3, gmpy)
doc: Improved wording in trigonometry.rst
doc: Added tikz to preamble (fixed latex compilation error)
doc: Changed order of latex imports to avoid xcolor's warnings
doc: Adjusted guide's examples to work with Python 2.5
doc: Improved guide following Aaron's suggestions