Removed stray files.

Removed files left from some old merge conflict.
Fixed warning about enabling c++11 for C sources