Reverted files after mistake.

On Friday 10/18 at 10:32PM I accidentally discarded a bunch of changes.
I recovered those (via dropbox) and I am now recommitting them here.