Merge juberti:master to doohickey branch

Same as #3, just on the branch.
new trailing whitespace, for which I will not apologize for removing later