Tidied up company-mode integration and updated the readme