old changes in hotfix-0.0.2 branch
Merge branch 'hotfix-0.0.2'

Conflicts:
	rvic/history.py
	rvic/variables.py
	rvic_model.py
initial formating changes to make_parameters.py
Merge branch 'develop' of github.com:jhamman/RVIC into feature/pep8

Conflicts:
	make_parameters.py
Merge branch 'master' of github.com:jhamman/RVIC into feature/pep8

Conflicts:
	make_parameters.py
Fixes to make_uh and formatting changes.

- Major speed improvements in make_uh due to the use of np.convolve rather than pure python convolution as was previously implemented.
- Some pep8 fixes but there are still some issues.
Changes to allow for routing on the same grid as the target domain.
i.e. if REMAP = False and AGGREGATE = False.
quick fix to parsing of outlet names
Add C convolution routine for speedup

-Also changes to structure of ring and unit hydrographs.  Changes are internal and are backward compatable.
-Fixed bug in agg_tsteps logic
Merge remote-tracking branch 'github/hotfix.0.0.3'
small fix to rvic/c_convolve.c syntax