First Merge Commit

Ready for testing on the lofar clusters.