eveything from trifork mac machine
commits from trifork mac dev