Merges in new changes

TODO: make names lowercase, merge back in gitignore change.