Merge pull request #28 from wtsi-npg/devel

pull changes from wtsi devel to my devel
Merge branch 'devel' of github.com:wtsi-npg/npg_tracking into devel
old and unused apache configuration files removed; old IL instruments removed from instrument utilisation menu; instrument uptime menu link removed; tests consolidation and tidyign up
remove accidentally commited port change for the devel apache server