Change name of README.txt to ChangeLog and fix order in release headers
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
add .gitignore to repo.
Add travis build status icon to readme.md
Merge remote-tracking branch 'origin/master' (VIC.4.1.2.k) into develop

Conflicts:
	samples/global.param.sample
	src/ChangeLog
	src/frozen_soil.c
	src/get_global_param.c
	src/global.h
	src/initialize_global.c
	src/initialize_model_state.c
	src/vicNl.h
Remove duplicate travis icon.
add Tfbflag and Tfbcount pointers to solve_T_profile_implicit declaration

This may have come up due to a problem with the merge of 4.1.2.k
Merge branch 'develop' of github.com:UW-Hydro/VIC into develop
remove sun1999 albedo option

Conflicts:
	samples/global.param.clean.sample
Merge pull request #77 from jhamman/feature/remove_sun1999

remove sun1999 albedo option

Resolves Issue #39
Add uncrustify configuration file to tools directory.