Merge pull request #5 from lanjelot/master

Fix second prompt for IPython
Add -i to bash_completion. Fix "-rs" completion.
Merge remote-tracking branch 'tweek/master' into minorbug