Escaped hyphens in makefile
Syncing upstream changes
Fixed incorrect fan speed assignment (fixes #1)
Merge branch 'master' into ubuntu-raring