Switch to ln vs cp
Merge remote-tracking branch 'ericmann/master'