Add option for primary key function
rename primaryFunction to primaryFormat to be slightly more descriptive. adds to #106
Merge branch 'oncemoreification-p_func'