Removed unnecessary import.
Added HList align.
Merge branch 'master' into scala-2.10.x