Adding auto-revert functionality to play more nicely with external tools.
Updating formatting for Marmalade.
Merge with feature/auto-revert.