Added options and commands to run supervisord first. supervisord in turn starts up ipython notebook, sshd as well as meqserver
Added some bash stuff to make things user friendly for first time users
Fixed a merge marker that was hanging around and an erroneous ro change
Merge pull request #1 from sjperkins/devel

Devel