admin area is chugging along. tests don't run yet
fixing migration, no idea why it started to complain now
removing deprecations in models
removed all deprecation warnings
unit tests are clean
functional tests are clean
all tests are clean!
Bump to 2.0.0.beta1
dependencies
Conflicts:
	comfortable_mexican_sofa.gemspec
Merge pull request #309 from glebm/2.0-jquery-ui-fix

jquery-ui dependencies (2.0)
fixing things up
removing sitemap extension thingy. easier to overwrite view file instead. less convoluted
update_columns for everybody
asset pipeline compatible image urls
fix asset path
Merge pull request #314 from glebm/2.0-asset-path

2.0 asset path
merging with current master, fixing things
changing readme
js issue
bumping version