Updated stable with new contrib commands, including test, watch, server