Cleaned up a bunch of code.
Stupid .DS_Store.
Stupid .DS_Store.
Stupid .DS_Store.
Merging crap.