some cleanup
clean up (cont.)
Merge branch 'code_cleanup' of remote into code_cleanup local

Conflicts:
	Idearator/config/environments/development.rb
Merge branch 'code_cleanup' of https://github.com/DevYah/coolsoft-13 into code_cleanup