Live_06032013

The final commit before going live. Other edits may follow.