fix illegal python

@gone 
Using ``raise`` on a non-Exception inheriting type is no longer legal and produces a ``TypeError``. Also, since master is a few commits ahead of develop it probably makes sense if the default branch of this repo is master.