Move functions in own file.
Include local aliases.
Add maven and ant options for windows machine.
Merge conflicts.