jhcarr/jsite — pull request #4 by jhcarr (2013-11-30 08:01:30+00:00)
Title: V1/test merge

Committed to old branch - this commit explicitly edits the conflicts for compatibility.