Be prepared... changes galore.

Too many to count. Some stuff still needs to be polished, though.
Fixed merge
Merge pull request #14 from OmgImAlexis/shnupbups

Lots of things and stuff