merge with --log
Update sublime plugins