Cleaned up some messages, spacing in continuous integration testing files.
Resolved merge conflict.