last fix for work; add cache directories
modify .travis.yml
add cache to .travis.yml
add deploy to heroku to .travis.yml
add deploy to heroku to .travis.yml
add deploy to heroku for prod and dev to .travis.yml
travis config

Conflicts:
	.gitignore
	.travis.yml
	config/database.yml.travis
Merge pull request #4 from wat32/do_travis

Do travis