Moves calc_age and agecat variables to Demographics folder and makes
them commonly used variables, closes #38