add Berksfile.lock to gitignore; pull in iputils into proxy-server
Merge pull request #4 from alanmeadows/ci_bugfixes

add Berksfile.lock to gitignore; pull in iputils into proxy-server