Merge pull request #12 from pstephen43/master

Sync up on 1/20/14
more work for datalogging
finished up datalogging
Merge pull request #145 from K-McK/master

sync up before 1/28 session
resolved merge issues
Merge pull request #23 from pstephen43/master

Sync up before 1/28 session