Merge branch 'master' of github.com:nipy/dipy into nipy-dipy-master
Merge branch 'master' of github.com:nipy/dipy into nipy-dipy-master
Merge branch 'master' of github.com:nipy/dipy into nipy-dipy-master
Removed storing of gfa and other properties from the odf method of dsi. These properties can be calculated at a later stage
DOC in peak_directions
RF Removed method variable, updated gfa example
TEST check difference between discrete finder and peak_directions, they should give the same result.
RF added spaces for pep8
RF removed gfa and other attributes from GQI odf and on the side corrected some trailing spaces
TEST minor trailing space correction
Simplified example
DOC minor change
RF: create_qspace and hanning_filter are now functions rather than methods
Added check for oddness of qgrid_size
Merge pull request #122 from Garyfallidis/simplify_dsi_odf

Removed calculation of gfa and other functions from inside the odf(sphere) of DSI and GQI