updated Code
Merge remote-tracking branch 'origin/master' into temp

Conflicts:
	_includes/nav.html
	_posts/2013-04-14-workon-conda.md
Work on panoramic stuff
Updates
reset master
reload master from temp