Add context information to duplicate definition warning
Tweak indentation rules to match Facebook conventions

Originally by azich.