Re-organized User Preference file
Tweaking AStyle Formatter
Merge remote-tracking branch 'origin/master'

Conflicts:
	User/Preferences.sublime-settings
Added sublime-text-2-goto-documentation package