Fixing a bunch of errors from earlier betas.
More fixes
Delete .DS_Store
Delete another ds_store
Merge pull request #36 from ijustdrankwhat/master

Fix all Justin's broke shit.