clean your code

hi,
what i have done was helping you clean your code.
i find some `.swp` files which needn't to commit, as well as solr files, 
and i move config/database.yml to config/database.yml.default that because someone like me may change that file but do not want do commit them.

last thing, i update the .gitigore file, it may help you...