Documentation

Signed-off-by: John Nelson <yield_rb@icloud.com>
Merge remote-tracking branch 'origin/master'

Signed-off-by: John Nelson <yield_rb@icloud.com>

Conflicts:
	TODO.md
More Travis image kung-fu