updated ipython ip and template id, tried to fix save issue
Merge branch 'master' of github.com:teharrison/Retina
Merge branch 'master' of github.com:MG-RAST/Retina

Conflicts:
	widgets/widget.NotebookDashboard.js