merge of bjsmith changes to cime users guide#1641

Merged

bertinia merged 3 commits intoESMCI:masterfrom bjsmith2014:master

Jun 5, 2017

+145-151

Commits on Jun 5, 2017

updating cime guide work through time 6/5
BJ Smith
committed
Syncing local with upstream master. bjsmith
BJ Smith
committed
update cime users guide
BJ Smith
committed