Update copyright year in fix task and refactor

The default copyright header now reflects 2014. Also, the copyright
header on existing files will not be affected by this change, only newly
created files. Also, a slight refactor to eliminate unnecessary
branching.