sync gitignore and style conventions with master