General cleanup of dependencies.

Dependencies were missing when cloning to new machine. Changed the gitignore to not ignore dist folders.  Also added .bowerrc to ignore list.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml