added alias to git add -i
added java7 alias
Merge new aliases into laptop branch