grunt tested, demographcis changed via beautify
updated parser to accomdate Jones mock up, fixed some bugs in various areas