update gitignore to allow easier commits on server_master branch
fix typo in gitignore