Merge pull request #21 from BigFav/fnc4

Re-added edit, and adjusted the PATH slightly to get it to work properly...
Readded shebang to edit.py.
Merge pull request #22 from johntanner/master

Readded shebang to edit.py.
Updating my local branch to match the newest version.