Added default=simple for push to work with newer versions of git
Merge remote-tracking branch 'origin/master'