updated views.py
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta

This merges on April 20/2014
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta
Merge branch 'master' of github.com:wassermanlab/GeneYenta