More org config changes, general cleanup:

- Taking NEXT todo state back out because I probably won't use it
- Adding some key bindings for magit status and diff commands
- Getting rid of previously commented out sections