remove capybara-webkit b/c of install overhead
set capybara http timeout to 20s

'rescue in rbuf_fill': Timeout::Error (Timeout::Error)
http://stackoverflow.com/questions/10011387/rescue-in-rbuf-fill-timeouterror-timeouterror
Merge remote-tracking branch 'origin/fix-iteration-3-2'