Cleaned up curly brace locations for some snippets.

Renamed bundle to avoid errors with how TextMate shows the bundle and
cleaned up some things.