re-formated frame.R, changed chris's join_vtr_files.R into a function
Merge branch 'master' of https://github.com/kaycole/fish_shift