Merge pull request #136 from johnnyshields/fix-manifest-path

Fix config.assets.manifest Rake task and Railtie
Conflicts:
	test/test_railtie.rb