Fix merge conflicts. Add basic cloudformation support. Closes #111.