Ignores Gemfile.lock

Conflicts:

	.gitignore
Locks down spree_core to 1.2.x where x >= 4

Conflicts:

	spree_flexi_variants.gemspec
Ignores test app
Removing all specs and related dependencies

Conflicts:

	Gemfile
	spec/spec_helper.rb
	spree_flexi_variants.gemspec
Use git to ensure that all files are included in gem
Add specific version numbers for carrierwave and rmagick

Conflicts:

	spree_flexi_variants.gemspec
Adds back testing support
Creates missing asset manifests

Conflicts:

	app/assets/javascripts/admin/spree_flexi_variants.js
Corrects store javascript asset manifest
Fixes bug with remove ad hoc option value remove links

Spree 1.2.4 introduced a slight change to the way the remove links
needed to work.
Use MiniMagick instead of RMagick.

Conflicts:

	Gemfile
	spec/spec_helper.rb
	spree_flexi_variants.gemspec
Update JS to latest in Spree to fix adding products to orders.

Conflicts:

	app/assets/javascripts/admin/orders/edit.js
trying to pull in all the good changes, especially the testing ones, that were done in 1.2
gets specs passing