Merge branch 'release-0.10'
specified dependancy versions explicitly
mime types specified in baw-workers instead
increment patch version
Merge branch 'hotfix-0.10.1'
Merge branch 'hotfix-0.10.1' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/settings.rb
	config/initializers/mime_types.rb
added todo reminders about deprecation warnings
Merge branch 'release-0.11.2'
Merge branch 'release-0.11.2' into develop
updated gems; incremented patch version; added guard-yard
Merge branch 'release-0.11.3'
Merge branch 'release-0.11.3' into develop
changes to fix deprecation warning from factory_girl
removed ruby 1.9.3 from travis tests
update gems; update settings
problem with Settings.instance.deep_merge
finally fixed logging and very old mis-used dot notation for hashes
updated mailer and harvester settings to match baw-workers
symbolize keys in smtp hash
symbolize keys in smtp hash