Merged changes from Alpha 1.1 into Alpha.

This should be the actual final commit to Alpha. (Maybe not if I can
find something really nice is fixed upstream.)

Signed-off-by: Alex Colson <guythundar@gmail.com>