First pass at using rugged#31

nolman wants to merge 2 commits intomastersquare/kochiku:masterfrom

first-pass-at-using-ruggedsquare/kochiku:first-pass-at-using-ruggedCopy head branch name to clipboard