Removing redundant file.

Missed a couple conflicts.

Cleaned up line terminators.

This might need looking into soon.  The line terminators in this file
seemed to get messed up.

Corrections to linker command line.

Fixes #16