misc changes
Merging from Dhruv
Merge branch 'master' of https://github.com/mikekucharski/inkd
local commit