Anyway, as I wanted to use 2.1.1, the simple fix for this issue is as follows:
edit
Electrum-2.1.1/lib/commands.pyFind line in def history saying:
tx_hash, conf, is_mine, value, fee, balance, timestamp = item
switch it with
tx_hash, conf, value, timestamp, balance = item
Edit: Diffed against released version, so this should be the correct fix.