Issue #375 Port collision

Update the template file to have the test port be different from the server port so you can run tests with the server running
Merge pull request #387 from paulsheldrake/master

fix(grunt): sets port for test server