Added base, updated adapter_base, added aliases.rb
Merging remote with local