decrease timeout
Merge branch 'Master' of github.com:modcloth/KIF into Master