Fixed issue with .htaccess (reverted to generic) and issue with routing component causing refreshes to fail.  I will probably try to switch out the routing component for angular-ui-route which offers a much more robust routing setup.
Merge remote-tracking branch 'origin/master'