ignore editor tools
add back locations marker
additional changes to server configs and very minor cleanups