Changing port number because it conflicts with JBoss/Wildfly test suite
Adding pretty git log alias
Desperate attempt to make maven stop taking focus constantly in OS X
Adding default git config to silence the warning from git
Adding convenience commands to edit and add unmerged files