Major improvements made to plugin importing with the ability to now specify plugin_modules in the config for 3rd party plugins
Merge branch 'master' of github.com:fgimian/amazon-ec2-monitor
Merge pull request #2 from lextoumbourou/master

Implemented swap plugin
Merge pull request #3 from lextoumbourou/master

Fixed up plugins and added tests
Merge remote-tracking branch 'upstream/master'