alerts index and test cleanup
Merge pull request #29 from serened/master

Alerts#index and more cleanup