Add testmerge alias
Fix bux in setup.sh
Remove 'dev' layout from tmux