Merge branch 'master' of [email protected]:zuk/camping

Conflicts:

	lib/camping/reloader.rb

nothing added to commit but untracked files present (use "git add" to track)