new ack type, and git aliases
Merge pull request #4 from gmedina/work-mac

new ack type, and git aliases