Merged v0.16 fork with defaults

rm citenp option, can be implemented through citep and citet