Updated version of fuubar to 2.0.0.rc1
Merge branch 'master' of github.com:dock0/dock0

Conflicts:
	dock0.gemspec
Updated version of rubocop to 0.24.0
Merge commit '90ae259'