add travis to repo for testing
add Makefile path
fix to travis make
Merge branch 'master' of github.com:UW-Hydro/VIC
Updates for VIC 4.1.2.k.
Merge branch 'master' of github.com:UW-Hydro/VIC into origin/VIC.4.1.2.k

Conflicts:
	src/ChangeLog