Update for Sublime Text 3 + Cleanup

Cleaned up some code and updated for Sublime Text 3.