Merge pull request #1 from cwolferh/master

Wholesale changes
Add ntp and trystack modules
Merge pull request #2 from jistr/ntp_and_trystack

Add ntp and trystack modules