Changes to setup to enable installation via pip