make haibu work again with npm
update flatiron version that has a less manky director version
Merge commit 'radekstepan/master' into ukraine