Added label snippet and added labels to ali and eq
Fixed citation snippets and added citea and citey
Fixed indentation issue
add options_for_select

add method `options_for_select` from Rails.
add rails callbak methods
change abbreviation to c for controller
respect the  convention
Merge remote-tracking branch 'upstream/master'
Syntax changes in accordance with Google.
use m as prefix and fix conflicts with other snippets
Merge pull request #320 from wongyouth/add_rails_methods

Add rails callback methods
Allow java else/elif to be expanded mid line.
Merge pull request #326 from RyanPineo/master

java: Allow else/elif to be expanded mid line.
Scala snippets fix
Update python.snippets

adding code encoding.
Merge pull request #327 from ches/fixes

Scala snippets fix
Merge pull request #328 from hallaj/master

Update python.snippets
Fix java setter method param case, remove return.

The paramater was keeping the case of the setter name.  It should
have been lowercased.  The other uses of the paramter were already
lowercased correctly.

There should also not be a return statement in a void method.
Change java set/get snippets to use mixedCase.

The java setter and getter snippets were incorrectly formatting the
set/get name as all lowercase.  It should be mixed case, as per java's
coding standard.

A new function was made (mixedCase) to handle that.
Add asi => assert_includes