Replaced hardcoded call to vi with $EDITOR to allow the user to use their favourite editing tool.
Merged in upstream changes.
Merge pull request #2 from SamuelCook/master

Replaced hardcoded call to vi with $EDITOR to allow the user to use their favourite editing tool.