4.2 update -- add timeout for CURL

Signed-off-by: Brian Nelson <yonbeastie@gmail.com>
Merge branch 'master' of github.com:justinwalsh/todaycms