Better homshick aliasm, does not require symlinking
Merge remote-tracking branch 'andsens/master'