Minor clean up 1/13/14
Merge branch 'master' of https://github.com/lgarrison/chile2014-group3
S
inor cleanup
minor updates