Added missing files to commit.
Fixed conflicts and generally smoothed over issues stemming from my noobishness.