git-merge.sh added to merge and mergetool
Added infinity plus dev app to startup script
Added testplan.blismedia.com to webservers started up on boot
shell-test.sh and template/tests.shell.sh added stop and pause functions