Merge pull request #189 from zenangst/master

Add Marvin plugin
Add CocoaControls plugin
NCSimulatorPlugin
Merge pull request #191 from scinfu/master

NCSimulatorPlugin
Merge pull request #190 from yeahdongcn/master

Add CocoaControls plugin
Move cocoa controls plugin from color_schemes to plugin section
Merge pull request #192 from yeahdongcn/master

Move cocoa controls plugin from file_templates section to plugin section
Update CocoaControls plugin repo url
Merge pull request #193 from yeahdongcn/master

Update CocoaControls plugin repo url
Update Xcode plugin template metadata
Add link to build to travis badge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	packages.json