added ability to read config file from ~/.spring.rb
updated readme and changelog
Merge branch 'master' of github.com:soul-rebel/spring
fix conflicts

Conflicts:
	test/acceptance/app_test.rb