pulling code over, refactoring
Merge branch 'master' of https://github.com/boneskull/angular-tags

Conflicts:
	.gitignore