Merging latest from JimHokanson's repo#1

Merged

slarson merged 4 commits intoopenworm:masterfrom

JimHokanson:master

Sep 26, 2013

Commits on Sep 15, 2013

Commits on Sep 26, 2013

Added a bit more to repo to indicate layout I had in mind
JimHokanson
committed