Updated for the new branching scheme
Merge remote branch 'upstream/master' into ctdpf_ckl_wfp
Added missing file
Adding
Updates from code review
Added test files to branch
Merge pull request #258 from cagood/ctdpf_ckl_wfp

Ctdpf ckl wfp