Fixes #11 - Updates to Express + Angular
Merge branch 'master' into updates