initial rails commit.
Merge branch 'master' of https://github.com/erpheus/parrotfeed

Conflicts:
	.gitignore