Cleaned up dumb variable names
Merge branch 'master' of github.com:bigjimmy/puzzlebitch