added intellij files to global gitignore
moved some git aliases around