Merge initial swift work from neillc's fork.

consistent indentation please