"Refactoring"
Merge branch 'master' of https://github.com/jovon/fimmed_up

Conflicts:
	lib/fimmed_up/configuration.rb
	lib/fimmed_up/connection.rb