Merge pull request #650 from ricnewton/master

Implement non-blocking shutdown command
Fix Makefile.am for test_ctx_destroy