Merged in various fixes made on master since the rewrite started.
Removed DS_Store files