removed empty lines in gemfile
Bringing branch capy inline with master

Merge branch 'master' into capy

Conflicts:
	Gemfile
set up capy
set up capy features folder and a tweet file
fixed local marge conflict in gemfile
just updating commits before pulling down main branch
fix of merge conflicts
uncommented stream code
just where I'm at now with testing
update readme
merge from master
update gitignore with simplecov
Merge pull request #16 from fox-squirrels-2013/capy

Pull request with gitignore for simplecov