- updated java template since I'm mostly working with Git projects now
  which don't have the SCM keywords.
- added functions/shortcuts for moving the current line up or
  down. Credits go to Magnar @ whattheemacsd.com
- updated java template to include the serialVersionUID to keep the
  Eclipse compiler happy.
- updated java template to include package statement
- added IDEA style key mapping shortcuts for java
  imports/organisation, rename refactoring.

- changed organisation when in gnus to Conduct.
- trying to hack around some git weirdness