Making sufia the new master branch to use the sufia gem for most parts of the system