Add Syphon back in and update for Entwined model.#44

fragmede wants to merge 3 commits intomastersquaredproject/Entwined:masterfrom

samson_syphonsquaredproject/Entwined:samson_syphonCopy head branch name to clipboard