added more folders to ignore
small updates
adding default commit message to merges