remove DS_STORE file
don't allow locale app to push locales
git ignore .localeapp folder and config
remove localeapp from gemfile, adjust readme
fix merge conflicts
update rspec rails
add jquery ui