Clean Up, Add Test for Loop and Remove some Embedly specific stuff