added formatting to numbers
added formatting to citations
Merged/fixed conflicts for #158
Merge branch 'aholachek-num-formatting'