Changed all tabstops to 4-space indents.
Resolved conflicts with space and characters in 'Dojo'
Another small merge for changed tab stops.