Updated crmApi to be latest from Angular.tpl

When I did the last bit of merging, I missed the changes to this
function in Angular.tpl which I've moved here.
Use the app version of bower instead of machine version.

Once npm installs bower in node_modules, we should be using that one for
all the bower commands instead of the local one.
Fixed mispelling: comparitor -> comparator.

It's nicer to have things spelled correctly.
Get the distmaker working with npm and bower.

We're going to start distributing the node_modules and bower_modules
using npm and bower now instead of having them in packages because we
feel that those are a better way to manage backages than the packages
repository. So the distmaker needs to copy those directories to the
distribution after running 'npm install' to get the packages downloaded.

Also I needed to put a resolution for the angular version in the
bower.json file because some of the angular plugins were resolving to
angular 1.2.x and we want 1.3.x. I also changed the version numbers to
start at 1.3.8, but allow minor version updates because that's what
we're using.
Install npm and bower modules in setup.

For the test and demo setups to work with the new npm and bower stuff,
npm install needs to get run. Civi buildkit calls setup.sh, so we'll put
it here for now.
Not used anymore.

I don't think this is used anymore. People just use setup.sh.