Fixed path so it now works properly with p4merge
Added more git aliases
Added more popd and mkdir alias
Disabled time stamp