Makes types more sensible (I hope)
Correctly finds and packs all symlinks
Merge branch 'handle-symlinks' into 'master'
Merge branch 'sensible-types' into 'master'