Get rid of all adapters must be given a unique id
Merge branch 'master' of github.com:iversity/makara

Conflicts:
	lib/makara.rb
fix for rails 4