test
Merge branch '7.x-1.x' of git.drupal.org:sandbox/adam_bear/2324243 into 7.x-1.x
Merge drupal w/ dev
Moved plugin js to separate file, updated styles.
Optimized functions, updated styles