Initial merge and switching over to the netsteps repo