kevingranade Merge a bunch of astyle fixes.

Latest commit 7a5b64a

Jan 4, 2014