Updated gitignore (fixed my git nightmare finally)
Added back plugins (git nightmare continues)
Merge branch 'master' of github.com:gjtrowbridge/freshly-rebuild

Conflicts:
	platforms/.gitignore