Corrected api.rb
Merge branch 'master' of github.com:chrisjomaron/slickfit-api

Conflicts:
	api.rb
Merge branch 'master' of github.com:chrisjomaron/slickfit-api
Tidied up rakefile
Merge branch 'master' of github.com:chrisjomaron/slickfit-api
Merge branch 'master' of github.com:chrisjomaron/slickfit-api

Conflicts:
	api.rb
Merge branch 'master' of github.com:chrisjomaron/slickfit-api
Merge branch 'master' of github.com:chrisjomaron/slickfit-api