added ack; updated git timeout
Merge branch 'master' of https://github.com/johndgiese/custom