Merge branch 'master' into keenan-work
TODO

Updated README with current todos
Merge branch 'keenan-work'
Merge branch 'master' into sam-work