Commit for Mon Jul 15 17:13:00 MDT 2013
Commit for Mon Jul 22 16:49:14 MDT 2013
Commit for Mon Jul 29 09:52:55 MDT 2013
Commit for Mon Jul 29 17:41:56 MDT 2013
Commit for Thu Aug  1 14:33:34 MDT 2013
Fix merge issues