Add .DS_Store to .gitignore
Moved stuff for a more gem-like folder structure
Messy commit: inject out stream and colours
Fixed failing test
Split double expectation into 2