alex 5/21/14 home
Merge branch 'master' of https://github.com/asmiller1989/wannipy

Conflicts:
	plot_data/PlotRho.py
	plot_data/PlotRho.pyc