Fix some death issues, initial ampton-keen pushing
Merge branch 'master' of github.com:sulix/omnispeak