Disabled yas in ansi-term + cleaned up code