php-mode was puke green due to mumamo.
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd

Conflicts:
	init.el
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Merge branch 'master' of http://github.shflint.com/ChrisH/emacsd
Enable actionscript mode.
Merge pull request #2 from Donnie/master

Actionscript update
Merge branch 'master' of github.shflint.com:ChrisH/emacsd
Actionscript weirdness....