Merge remote-tracking branch 'upstream/thrift'
Bug fix: lacli archive list was broken

It seems like an extra line was insterted in print_archives_line()
that tried to print the archive expiry date, which was not available.
Removed.
Merge pull request #118 from vrypan/cli-ui

Bug fix: lacli archive list was broken
solve problem with unserializable capsule objects in upload state
don't exit on token timeout
have a smaller grace period for the token timeout
indentation
check if upload has errored out before starting upload
two minute grace period
fix #121
check pending uploads when doing status
add reset command
fix regression with progress bar
try again when unlinking upload
remove pdb
add missing module
add missing break and reorder actions
Merge branch 'master' into vasillis
support preferences. Fixes: #30
support saving login preferences