Changed API to a DSL to be a little friendlier, modified tests, removed silly OS X file