Moved away from aptana and learning how to use the indicator applet
Merge branch 'master' of github.com:jabulmer12/megalinux

Conflicts:
	megalinux/__init__.py
Initial commit