Reordeed symbols and increased size of diamond
Merge remote-tracking branch 'upstream/master' into jp728
Merge remote-tracking branch 'upstream/master' into jpTemp
Merge remote-tracking branch 'upstream/master' into jpTemp
Merge pull request #879 from jaypoulz/jp728

Reordered symbol markers for scatter/timeline and adjusted size of diamond.