Disable semantic-mode
Updated .gitignore
Cleanup
Merge