cleaning out controller
added underscore
wired up angular controller
touch
fix merge
api wired up