Cleaned up files, added temporary content to readme, and added cleaner/more robust options to API