test for Travis
adding internal energy fn
roxy for new function
NAMESPACE not ready for roxy
merge resolve
Merge pull request #47 from jread-usgs/dUdt

Add D udt (heat storage)
Changing version to reflect proper semantic versioning
Merge branch 'master' of github.com:GLEON/rLakeAnalyzer
Merge remote-tracking branch 'origin/dUdt'

Conflicts:
	DESCRIPTION
Minor tweaks to docu
Minor tweaks to docu2
internal energy timeseries function.
Merge pull request #49 from lawinslow/master

merged internal.energy and ts.internal.energy functions