80 column width fix

Using this as a testbed for getting a correct rebase workflow going. This was created in a separate branch, rebased onto master and pushed to ccp brennivin. And now trying to flow it upstream.