Use binary RVM, not the shell version

- Tidied the server deployment script