Menu tweaks, add the SettingsActivity to the manifest, update gitignore