Updates Rails to 4.0
Don't put the development log in the repository.

Merge branch 'master' of github.com:TerabyteNation/tera-tf

Conflicts:
	log/development.log