Added new upstream version of the Search API Solr 3.6 conf files
Added TODO.md
Updated README.md
Remove trailing slash
Code cleanup