Merge pull request #61 from tbohn/VIC.4.1.2.j

Merge of Ted's bug fixes.
Merge pull request #69 from UW-Hydro/VIC.4.1.2.j

VIC.4.1.2.j
Merge remote-tracking branch 'upstream/master'