TEST: starting test for reslicing
Merge branch 'nipy-dipy-master' into add_tests_resample
TEST: added initial test for reslicing
TEST: added noise estimation checks when interpolation changes
Minor corrections
BF + TST: Reinstated eig_from_lo_tri

Now, with testing!
Added info explaining that reslice is replacing resample
DOC: typo correction
DOC: updated api changes
TST: Increasing testing on life.

Trying to sort out buildbot failures:

http://nipy.bic.berkeley.edu/builders/dipy-py2.7-osx-10.7/builds/204/steps/shell_6/logs/stdio

http://nipy.bic.berkeley.edu/builders/dipy-py2.6-32/builds/442/steps/shell_5/logs/stdio
TST: Reduce sensitivity on these tests.

This level of accuracy is not handled well on all platforms:

http://nipy.bic.berkeley.edu/builders/dipy-bdist32-27/builds/168/steps/shell_8/logs/stdio
Merge pull request #516 from arokem/stream-rigid-bots

TST: Reduce sensitivity on these tests.
Merge pull request #515 from arokem/life-bots

TST: Increasing testing on life.
DOC: updated api changes
Merge pull request #508 from Garyfallidis/add_tests_resample

Tests for reslicing
Merge pull request #513 from arokem/eig_from_lo_tri

BF + TST: Reinstated eig_from_lo_tri
PEP8 and linked max odf tracking example
DOC: corrected typos and english
Merge pull request #519 from Garyfallidis/peping

Christmas PR! Correcting typos, linking and language for max odf tracking