put .idea in .gitignore

Conflicts:
	.idea/nanocloud.iml
	.idea/workspace.xml
precompile welcome.css
switch to postgres

Conflicts:
	.rvmrc
	Gemfile
try different include