Don't skip the tests anymore
Add DRY bottles solution
Merge branch 'master' of https://github.com/toastercup/careerbuilder-2014-march

Conflicts:
	bottles/lib/bottles.rb