added different, more intuitive resizing
updated Solitary's changes to work with upstream changes from darcs
Merge branch 'SolitaryCipher-master'