Added alias to clean up merged git branches
Added settings for autocrlf and simple push