defaulting to current year and adding test
Defaulting to 2012 for the demo, test for correct defaulting is just commented out for later use
fixing merge conflicts
Needed to merge with the updated maser branch.
Merging now that Travis tests are on master
needed to save merge conflict
Merge pull request #61 from 18F/year_default

Year default