Added ui-router (wip)
Cleaned up PR for #43
Merge branch 'sroosen-ui-router'