Fixed AttributeError

AttributeError: 'Headers' object has no attribute 'update'
Forced Flask-Restful to run custom options method
Headers are always set in after_request
Merge branch 'cors-on-options' of git://github.com/tooxie/shiva-server
Modified for extra clarity