Add magent back in, still need to work out environment problems with resque workers

script/server

@@ -82,5 +82,5 @@ fi
 
 mkdir -p -v log/thin/
 bundle exec ruby ./script/websocket_server.rb&
-#bundle exec magent start --log-path=log/ &
+bundle exec magent start --log-path=log/ &
 bundle exec thin start $args