Merge pull request #3 from frasercrmck/master

Only reject unformatted files which are staged for commit
Merge remote-tracking branch 'upstream/master'