Added buffers & cached memory
fixed merge conflict
fix deprecation warning
fixed building on mac
[cputemp] functions correctly
[cpu temp] fixes
[cpu temp] just in case some bozo runs MakeHeader.py
code generation causes more problems than it solves
[cpu temp] fixed trailing }
Create the m4 dir if it doesn't exist.

aclocal version 1.13 fails with the following error:

aclocal: error: couldn't open directory 'm4': No such file or directory

Creating the m4 directory before executing aclocal fixes the error.
Merge pull request #1 from benburkert/patch-1

Create the m4 dir if it doesn't exist.
Merge branch 'master' of https://github.com/max-horvath/htop-osx
Merge in incremental filter code from http://bit.ly/YTWCqH
Adjust SMC key for the MacBook Pro. This is not ideal, as there are different SMC keys used by different hardware models, but this at least matches what I can test.
Change name of the meter to CPUTemp so as to not confuse the .htoprc loading of the CPU meter. Also remove the degree character from the display, as it was apparently severely confusing RichString.
Bump build version
Work on proper handling of temperature sensor detection
Further work on CPU temperature monitoring
Merge remote-tracking branch 'stormerider/master'

Conflicts:
	Makefile.am
add STARTTIME column