Added align.
Added acpid.
Merge pull request #2 from dimkr/master

align and acpid