Merge branch 'gh-pages' of github.com:pynbody/pynbody into gh-pages

Conflicts:
	_images/density_integrated.png
	_images/density_slice.png
	_images/halo1_image.png
	_images/snapshot_manipulation_fig1.png
	_images/snapshot_manipulation_fig1_wide.png
	_images/snapshot_manipulation_fig2.png
	_images/snapshot_manipulation_fig3.png
	_images/temperature_slice.png
	_images/vcirc_profiles.png
	_modules/index.html
	_modules/pynbody/analysis/angmom.html
	_modules/pynbody/analysis/cosmology.html
	_modules/pynbody/analysis/decomp.html
	_modules/pynbody/analysis/gravity.html
	_modules/pynbody/analysis/halo.html
	_modules/pynbody/analysis/hmf.html
	_modules/pynbody/analysis/ionfrac.html
	_modules/pynbody/analysis/luminosity.html
	_modules/pynbody/analysis/pkdgrav_cosmo.html
	_modules/pynbody/analysis/profile.html
	_modules/pynbody/array.html
	_modules/pynbody/bridge.html
	_modules/pynbody/derived.html
	_modules/pynbody/family.html
	_modules/pynbody/filt.html
	_modules/pynbody/halo.html
	_modules/pynbody/plot/gas.html
	_modules/pynbody/plot/generic.html
	_modules/pynbody/plot/metals.html
	_modules/pynbody/plot/profile.html
	_modules/pynbody/plot/sph.html
	_modules/pynbody/plot/stars.html
	_modules/pynbody/plot/util.html
	_modules/pynbody/ramses.html
	_modules/pynbody/snapshot.html
	_modules/pynbody/sph.html
	_modules/pynbody/tipsy.html
	_modules/pynbody/units.html
	_modules/pynbody/util.html
	_static/basic.css
	_static/doctools.js
	_static/halo1_image.png
	_static/jquery.js
	_static/nature.css
	_static/searchtools.js
	_static/snapshot_manipulation_fig1.png
	_static/snapshot_manipulation_fig1_wide.png
	_static/snapshot_manipulation_fig2.png
	_static/snapshot_manipulation_fig3.png
	_static/vcirc_profiles.png
	_static/websupport.js
	acknowledge.html
	analysis.html
	bibliography.html
	convenience.html
	derived.html
	docs/_static/halo1_image.png
	docs/_static/snapshot_manipulation_fig1.png
	docs/_static/snapshot_manipulation_fig1_wide.png
	docs/_static/snapshot_manipulation_fig2.png
	docs/_static/snapshot_manipulation_fig3.png
	docs/_static/vcirc_profiles.png
	essentials.html
	genindex.html
	index.html
	installation.html
	loaders.html
	objects.inv
	pitfalls.html
	plot.html
	py-modindex.html
	search.html
	searchindex.js
	tutorials/configuration.html
	tutorials/data_access.html
	tutorials/example_code/density_integrated.hires.png
	tutorials/example_code/density_integrated.pdf
	tutorials/example_code/density_integrated.png
	tutorials/example_code/density_profile.pdf
	tutorials/example_code/density_slice.hires.png
	tutorials/example_code/density_slice.pdf
	tutorials/example_code/density_slice.png
	tutorials/example_code/rotcurve.pdf
	tutorials/example_code/temperature_slice.hires.png
	tutorials/example_code/temperature_slice.pdf
	tutorials/example_code/temperature_slice.png
	tutorials/filters.html
	tutorials/halos.html
	tutorials/performance.html
	tutorials/pictures.html
	tutorials/processing.html
	tutorials/profile.html
	tutorials/rotation_curve.html
	tutorials/snapshot_manipulation.html
	tutorials/tutorials.html
docs update
Merge branch 'gh-pages' of github.com:pynbody/pynbody into gh-pages

Conflicts:
	_images/density_integrated.png
	_images/density_slice.png
	_images/halo1_image.png
	_images/snapshot_manipulation_fig1.png
	_images/snapshot_manipulation_fig1_wide.png
	_images/snapshot_manipulation_fig2.png
	_images/snapshot_manipulation_fig3.png
	_images/temperature_slice.png
	_images/vcirc_profiles.png
	_modules/index.html
	_modules/pynbody/analysis/angmom.html
	_modules/pynbody/analysis/cosmology.html
	_modules/pynbody/analysis/decomp.html
	_modules/pynbody/analysis/gravity.html
	_modules/pynbody/analysis/halo.html
	_modules/pynbody/analysis/hmf.html
	_modules/pynbody/analysis/ionfrac.html
	_modules/pynbody/analysis/luminosity.html
	_modules/pynbody/analysis/pkdgrav_cosmo.html
	_modules/pynbody/analysis/profile.html
	_modules/pynbody/analysis/ramses_util.html
	_modules/pynbody/array.html
	_modules/pynbody/bridge.html
	_modules/pynbody/derived.html
	_modules/pynbody/family.html
	_modules/pynbody/filt.html
	_modules/pynbody/halo.html
	_modules/pynbody/plot/gas.html
	_modules/pynbody/plot/generic.html
	_modules/pynbody/plot/metals.html
	_modules/pynbody/plot/profile.html
	_modules/pynbody/plot/sph.html
	_modules/pynbody/plot/stars.html
	_modules/pynbody/plot/util.html
	_modules/pynbody/ramses.html
	_modules/pynbody/snapshot.html
	_modules/pynbody/sph.html
	_modules/pynbody/tipsy.html
	_modules/pynbody/units.html
	_modules/pynbody/util.html
	_static/halo1_image.png
	_static/jquery.js
	_static/searchtools.js
	_static/snapshot_manipulation_fig1.png
	_static/snapshot_manipulation_fig1_wide.png
	_static/snapshot_manipulation_fig2.png
	_static/snapshot_manipulation_fig3.png
	_static/vcirc_profiles.png
	acknowledge.html
	analysis.html
	bibliography.html
	convenience.html
	derived.html
	docs/_static/halo1_image.png
	docs/_static/snapshot_manipulation_fig1.png
	docs/_static/snapshot_manipulation_fig1_wide.png
	docs/_static/snapshot_manipulation_fig2.png
	docs/_static/snapshot_manipulation_fig3.png
	docs/_static/vcirc_profiles.png
	essentials.html
	genindex.html
	index.html
	installation.html
	loaders.html
	objects.inv
	pitfalls.html
	plot.html
	py-modindex.html
	search.html
	searchindex.js
	tutorials/configuration.html
	tutorials/data_access.html
	tutorials/example_code/density_integrated.hires.png
	tutorials/example_code/density_integrated.pdf
	tutorials/example_code/density_integrated.png
	tutorials/example_code/density_profile.pdf
	tutorials/example_code/density_slice.hires.png
	tutorials/example_code/density_slice.pdf
	tutorials/example_code/density_slice.png
	tutorials/example_code/rotcurve.pdf
	tutorials/example_code/temperature_slice.hires.png
	tutorials/example_code/temperature_slice.pdf
	tutorials/example_code/temperature_slice.png
	tutorials/filters.html
	tutorials/halos.html
	tutorials/performance.html
	tutorials/pictures.html
	tutorials/processing.html
	tutorials/profile.html
	tutorials/rotation_curve.html
	tutorials/snapshot_manipulation.html
	tutorials/tutorials.html
docs update