Merge pull request #648 from jnarron/havoc

Upgraded to angular v1.3.1 and removed angular-route