added ability for conditional sif requests
Merge branch 'master' of github.com:canadaduane/openagent

Conflicts:
	Gemfile.lock