Merged in latest submodule updates
Added .swp and .so files to the gitignore file
Fixed submodule config