logging and a high level timeout
Merge branch 'master' of github.com:joewilliams/nugget