update to 2014
update
Merge pull request #171 from tcarver/master

misc